backport ITI-61 implementation into ipf-2.3 branch