Merge pull request #18400 from nmav/tmp-tang-self-contained