Merge "Add enforcement of overlayable targetName"