Merge "Use current user isntead of system user if no --user parameter is passed" into rvc-dev