case 2887 - Markup change.
Merge branch 'case-2887' into new-search