Eclipse 946 - Phase 3 changes to core