Added TS-1910 to backport a few select patches to make clang happier.