Implemented task #245537