Merge "Don't run failing 'other user' test pre-R" into rvc-dev