Merge "Merge branch 'stable-3.5' into stable-3.9" into stable-3.9