Merge "Revert "nfc(api): Remove fg checks from API class""