#4137 fix merge