Merge branch 'v7.2.0-beta' into develop