Merge branch 'backport-ticlang' into ticlang-compilers