Merge branch 'jk/use-compat-util-in-test-tool'