Merge branch 'sp/smart-http' into next