[sprint 44 resolved issues SAT-677, SAT-678]