[UPDATE] Bump to 2.2.1
[DOC] Tidy up changelog
Merge branch 'release/2.2.1' into develop