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