53a19de Ql fixes (#21742)