Merge "Make DFC handle multiple messages from MR"