Merge branch 'release/6' into develop
Bumped version after release.
Updated version of fenix.
Bumped version for release.
Merge branch 'release/7'