New PushMessage functionality merge