SOS-2494 Master - added creatorClassNameId and creatorClassPK