Merge branch 'js/test-unset-trace2-parents'