[sprint 43 modification in issues sat-617, sat-630]