Merge branch 'ibm4704'