Merge "Event Source: switch from wildcards to regexs"