Merge "Merge branch 'stable-3.6' into stable-3.7" into stable-3.7