[mq] working branch - merge ce9a1b6968 on top of main at 8a450cc476

[mq] working branch - merge ce9a1b6968 on top of main at 8a450cc476 #40651