Merge branch 'refs/heads/3.0/develop' into production