Merge branch 'release/22' into develop
Bumped version for development after release
Upgraded version of fenix to 2.1.4 and fenix-ist to 1.0.6
Bumped version for release of 23
Merge branch 'release/23'