#16245 Match works with GenericMessages