Merge branch 'tc/smart-http-restrict'