[mq] working branch - merge 2d73f8d9a7 on top of main at fd3f4ff2a2

[mq] working branch - merge 2d73f8d9a7 on top of main at fd3f4ff2a2 #5843