Rewrite match generator, add copy, null output

Change-Id: I2a00dafea1af6129b946be8c790ee1ea70801f8f
8 files changed