Implemented #234709