Merge change 10329

* changes:
  Removed usage of tabs for indention