SOLUTION-21412

SOLUTION-21412