Merge "Fixes headers for new and older calls."