sprint-45 SAT-724
[sprint 45 resolved issues dinshaw]