Merge branch 'hotfix/fix_functioanl' into develop

* hotfix/fix_functioanl:
  some fixes
  add ubtton
fix tests
Merge branch 'release/1.8.2.1'

* release/1.8.2.1:
  fix tests