Merge pull request #4396 from tru/guicontrolheaderguard