Fix stubs problem due to merge
Merge branch 'master' into type-system-features