version & changelog
Merge branch 'release/2.12.1' into develop