Merge branch 're-add_idl_entity_check' into 'ibm-trunk'