am a4f6d228: Merge "Add a method for replacing tokens in the preprocessed headers"

* commit 'a4f6d2281f979c013080e28b1f658c2ba9a8e9f3':
  Add a method for replacing tokens in the preprocessed headers