This MR has the new custom header related changes in the entitlements service. Please refer to this issue