Merge "Manage/History buttons should be multiuser aware" into rvc-dev