Merge "Add NO_HUN_FOR_OLD_WHEN flag." into tm-qpr-dev