Merge "RFC: Reorganize MFQE loops"