Merge branch 'hotfix/0.2.15'

* hotfix/0.2.15:
  fix js error in toggler
revert js fix
Merge branch 'hotfix/0.2.16' into develop

* hotfix/0.2.16:
  revert js fix