Submitting now so folks can test using mrtest add 5557, will merge after 6.11 is released.
mrtest add 5557