Merge branch 'acorn' into jit