Fixed SOL005 v2.4.1 Review issues.

Status Job ID Name Coverage
  External
pending jenkins