Associated change with NFVIFA(18)0001072 fixing Issue 0007794
This will create a new commit in order to revert the existing changes.
