Merge "Add TID-to-Link mapping capability fields"