[Users] Backports