copies master fix to 2.5 #4197