Merge branch 'hotfix/0.2.16'

* hotfix/0.2.16:
  revert js fix
Merge branch 'develop'

* develop:
  fix toggler js
fix toggler
Merge branch 'hotfix/0.2.17' into develop

* hotfix/0.2.17:
  fix toggler