Implemented task #245526