Merge IBM development contributiions. As it does not appear possible to alter the...