Merge branch 'fix/active-user-query' into 'develop'