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