Merge "Fix corrupted markup background" into devel/master