Merge branch 'release/4.12.0' into develop