Update to 7.4.295 port r354670