AMEC-1853. don't show header if there is no figure
Merge branch 'dev-AMEC-1853' into release/2.8.6rc