Correct HeaderIds plugin guide
Merge remote-tracking branch 'upstream/commercial-hotfix-batu-fr1' into commercial-hotfix-batu-fr1