Merging changes from TaskExecHandler and MsgPush