[sprint 43 resolved issues SAT-623, SAT-631, SAT-633, SAT-634, SAT-635, SAT-636, SAT-637]

[sprint 43 resolved issues SAT-623, SAT-631, SAT-633, SAT-634, SAT-635, SAT-636, SAT-637]