Merge branch 'release/3.12.0'