Fix indentation and alignment.

Indentation is with tabs while alignment is with spaces.
Merge branch 'feature/fix-bug-700542' into develop