Merge "Use double-underscore instead of non-ASCII character for class name separator"