Merge "Add message id to interface"