Merge branch 'release/39' into develop
Bumped version for development after release.
Upgraded version of fenix to 2.1.18. Upgraded version of fenix-ist to 1.0.12
Bumped version for release of 40
Merge branch 'release/40'