[sprint 45 resolved issues SAT-716,SAT-717]