do not generate metadata in the XML when the header is empty
Merge remote-tracking branch 'refs/remotes/origin/master'