Merge branch 'jn/v0-with-extensions-fix' into master