Merge "Add support for metadata to the Match/Action classes"