Merge "Introduce MessageDeliveryDelegate" into rvc-dev