Tau updates 7 2 x

This adds last-minute tau updates to #5204
(Can replace #5204 if signed off in time)