Implementation of ENH02.04. from IFA014

NFVIFA(21)000180