SC-4646: Resolve

Owned by Kanamafu

Pets