Update to 7.4.518 port r373363