Merge branch 'hotfix_fix_schedule_js' into develop
fix schedule js again
Merge branch 'develop'