Merge with latest acorn