MT#5789 fix cfb23bb974f2286ffc0d2d091e53c507ad0bbc81