I don't intend to merge this until 6.14 is released, making a MR now to help with testing (mrtest add 6216)
mrtest add 6216
cc @caleb @jane400 @anjandev