Merge "Add optional mask argument to NxMatchRegister"