Hub modifications to prevent exception firing
Merge remote-tracking branch 'origin/refactoring'
new sln file