Merge branch 'gsfr-current-user'