ML-6869: Brownie

Owned by Poutre