[sprint 43 resolved issues SAT-639, SAT-638]