Fix for UATNBNXR076 - 2nd Revert
UATNBNXR076 - 2nd Revert - part 2