Sync with roxy

Manually cherry-picked commits not in stoney yet.