Merge branch 'lt/unitype' into js/c-merge-recursive