Sprint-47 SAT-890 SAT-891 SAT-892 SAT-895 SAT-896 SAT-897
[sprint 47 resolved issues of dinshaw]