Merge "Switch from "#" to "__" when encoding fully-qualified class names"