Merge branch 'tc/smart-http-post-redirect' into maint