HYDRA-59 (Jon) bring the subtree up to date

This originally went in under HYDRA-59.