Merge tag '2.0.8' into develop

Version 2.0.8
Fix CTO-126, cleanup deprecated and buggy javascript.
Merge branch 'release/2.0.9'