Fix for UATNBFBL026 - 5th Revert