A base tag for 20.09-based UPF (take 2)