JBIDE-14963: Scaffold Entities: Overwrite