Update to 7.4.364 port r361806