CORE-235 changes for 'pivot object' part