NULL-22671

NULL-22671