ANI-3741: Flapper

Owned by rayxray