Merge pull request #16745 from neheb/tinc2