Merge "Promote no_hun_for_old_when to teamfood" into tm-qpr-dev