Sync with patches that went in roxy