Implemented task #245523