sprint-47 SAT-893 SAT-894 SAT-898 SAT-899 SAT-900
[sprint 47 resolved issues by dinshaw]