Merge "Merge branch 'stable-3.4-2021-07' into stable-3.4" into stable-3.4