Basic build updates to 5.4.7.18019