Merge branch 'feature/allow-user-query-via-id' into 'develop'