ML-2143

Owned by strays-adopts@dA