Merge "Improve multi user functionality for restricted users" into rvc-dev