Merge branch 'release/19' into develop
Bumped version for development after release.
Upgraded version of fenix
Bumped version for release of 20
Merge branch 'release/20'