Added offline notification support
 Merge