vote on TS-1912 and zwoop's massive build-backport.