Backport the changes in AbstractHttpData and its subtypes from 3.6 to 3.5