Merge branch 'release/94' into develop
Bumped version for development after release.
Upgraded version of fenix to 3.12.1
Bumped version for release of 95
Merge branch 'release/95'