Merge branch 'js/test-tool-gen-nuls'