Merge "Use current user instead of SYSTEM." into rvc-dev