Merge branch 'hotfix/fix_functioanl'

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

* release/1.8.2.1:
  fix tests
fix make up n events
Merge branch 'hotfix/fix_make_up_3' into develop

* hotfix/fix_make_up_3:
  fix make up n events