CORE-45: reflected changes in core