Merge "Unhide HyphenEdit related methods"