Merge branch 'jk/unit-tests-buildfix' into js/unit-test-suite-runner