Merge branch 'js/http-custom-headers'