[#2422] Improve PQM branch.