Merge branch 'feature/useragent-override' into 'develop'