Cherry pick  to add additional headers