JBIDE-15496

Phase 1 of migration, easy separation