Merge branch 'release/ZTM1NT'
Merge tag '0.1.6' into develop

Adding changes to hf hotfix