CHAR-138: Diligence

Owned by Vyn