[sprint-36 resolved issues SAT-444, SAT-445, SAT-446, SAT-449]
Merge branch 'viveksh-master'