#96: Override Module and Component
Merge remote-tracking branch 'origin/master'