Code clean.
Merge branch 'develop' into js-fix