Merge branch 'bugfix/ap-uri-user-search' into 'develop'