done. if it does not works eff it
Merge branch 'hotfix/1.0.6'