Fix multimodule build
Merge branch 'series/1.0.x'