Merge "Rename from SHELL_UID should update database rows" into rvc-dev