Fix gulp task issues
Merge branch 'hotfix/compile-task-fix'