Merge branch '3.5-dev' into cole/user-agent-manifest-fix