Merge "Support Underline to Markup using underlined-character-run" into devel/master