STAR-948: Pest

Owned by baa