Gopal,BalajiN | #178 | Fixing push messages flow