Forward-merge build fixes from Ports Tree