Merge branch 'release/16' into develop
Upgraded fenix to vesion 2.0.6
Bumped version for release of 17
Merge branch 'release/17'