Implemented task #245520