Merge branch 'fix/user-agent-overriding' into 'develop'