Fold the long-tag fix into the v4.1.22 cut so the tag ships documented

Fold the long-tag fix into the v4.1.22 cut so the tag ships documented #1414