Merge branch 'js/ci-check-whitespace-updates'