sprint 53 resolved issues SAT-1235, SAT-1249