merge r310845 from the Ports Tree