Fix for CFF Form

UATNBFBL006 - 2nd Revert
UATNBFBL013 - 2nd Revert