Fix for UATNBFBL026 - 6th Revert