sprint-36 resolved issues modification SAT-444, SAT-445, SAT-459

sprint-36 resolved issues modification SAT-444, SAT-445, SAT-459