Multi VI + code reorganization
Merge remote-tracking branch 'origin/master'