Implemented changes for request #29725.