Merge pull request #1040 from sliai/support-opteed-header