Merge branch 'release/2.12.0'
bumped version