Merge branch 'hotfix/0.20.17'
Fix js in disk saving mode
Merge branch 'master' into develop