MYO-3811

Owned by tfb