Add add-forward-headers option
Merge bug25935