Added more HTTP caching related data
auto-merge staging into master