pull in quantum changes to work with rhos
merge rhos code onto develop