[mq]: fixes.patch

--HG--
extra : transplant_source : A%7C%80U%3BF%08%F3%E0%B1%17%A6%24%1DK%40%C5%03%E4%BD