Merge branch 'fix/truncate-remote-user-fields' into 'develop'