[#2387] Fix final commit in pqm merge.