Added http endpoint hooks
Merge branch 'fix-http-endpoint' into test