Merge branch 'ef/http-o-depends-on-gvf' into maint