Implemented CORE-1403