- [1.21.4] Sync remaining `c` tags from Fabric side (#1628)