Merge "Binary masks in match types yang model changed to numbers. Plugin code review...