*Implemented CORE-585