MANT-2135

Owned by stxr_vaen