Merge branch 'release/5.12.0' into develop