Upgraded versions of fenix and fenix-ist to 2.0.7 and 1.0.2 respectively
Merge branch 'hotfix/18.1'