Merge "Fix indentation" into sc-dev