Upgraded version of fenix to 2.1.6
Bumped version for release of 25
Merge branch 'release/25' into develop
Bumped version for development after release.