case - 2111 Export search page with search header block.
Merge branch 'case-2111-2' into develop