Merge "Converting message.obj to AsyncResult to deliver context" into main