Implemented task #245519