sprint 53 resolved issues SAT-1235, SAT-1249
Merge branch 'master' of github.com:Cis-Madhusudhan/satudunia