Update to 5.4.7 build 17898