Merge pull request #2400 from esdrubal/extrahead