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