Implemented changes CORE-1533