[mq] working branch - merge 89d51881f6 on top of main at 5a5c8d48c2

[mq] working branch - merge 89d51881f6 on top of main at 5a5c8d48c2 #45854