Merge pull request #31974 from brson/beta-next

Move the RFC 1214 breakage to 1.7 compatibility notes