DIABLOLOSER-1609

DIABLOLOSER-1609