Code

Merge branch 'sp/smart-http'