Merge branch 'test-extradep-fix'