Merge branch 'sp/smart-http-failure' into maint