SOLID SO-1403

SOLID SO-1403