Added switch for optional components
Merge remote-tracking branch 'origin'