submib personal changes

Changes
Merge remote-tracking branch 'origin/Joseph_Nov17' into Joseph_Nov17