[#1749] Merge PQM with squash.