[COOK-2073] Add support for Match block