Merge branch 'lt/deepen-builtin-source'