Small Fixes.
Fixing indentation
Merge remote-tracking branch 'origin/driver-dev' into driver-dev