#18937 fixed remarks