Merge branch 'user-updates' into 'develop'