Get defaultAdatper unit test working
Merge branch 'master' into nested-eager