Merge "Add comments to messageId, subMessageId and data" into rvc-dev