Bug 40217: Rebased to v99.2.0
As I wrote on #40217 (closed), TBA 11.0 and 11.5 have the same patch sets (at least for the moment, and at least from v94).
Therefore, this has been rebased from 11.5, rather than v96 11.0.
As I wrote on #40217 (closed), TBA 11.0 and 11.5 have the same patch sets (at least for the moment, and at least from v94).
Therefore, this has been rebased from 11.5, rather than v96 11.0.