Merge branch 'user-query/filter-out-internal' into 'develop'