Merge branch 'ibm-trunk' into support_idl_narrow