Merge "Add API flag for AFL API" into main