SOLUS-2620

SOLUS-2620