APD-207: Search in header formatted
Merge branch 'APD-207' into develop