Implemented Changes to CORE-1236