Merge branch 'feature-user-commands' into develop