Merge "Improve the underline markup" into devel/master