To help with testing: mrtest add 5681. I intend to update this branch when new RCs are out so that it's easy for me/others to test, then merge when 6.12 is released.
mrtest add 5681