Update indentation to comply with coding standards
Merge