Fixing issue that happened now that userData.AutoGitCommit is set to false (it had the side effect that the local UserData was not loaded)
Merge branch 'Issue_404'