Merge roxy branch into stoney

I did a merge instead of cherry-picking commits. I can cherry-pick if preferred.