Merge "A payload re-selection test" into tm-qpr-dev