Resolved conflict on pull request
Fixed network push on non-activity thread
Merge branch 'chhapil-master' into develop