Update to 7.4.398 port r364341