Merge branch 'fix-default-install-config' into release-3.1