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

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