Merge branch 'hotfix/3.6.10-2' into production
a bunch of https's
version merge