Merge "Fix failed while running same pair again" into tm-qpr-dev