Merge branch 'master' into equinox-3.7-upgrade