See #17716 as the starting point If 6.9.2 happens, part of the work will be collecting all relevant change sets on this topic to be backported.
