Merge markup fixes for #7198 patch.