Merged feature branch 'multi-module'
Updated with contribution message