Merge branch 'sp/smart-http-content-type-check'