Merge branch '814' into 1.7.x
update webjars version to 0.0.6 and fix the issue
Merge branch 'issue789' into 2.0.x