Merge "Only allow alphanumerical characters, '-' and '_' in event trigger names"