Merge branch 'bugfix/remote-user-atom' into 'develop'