Merge "Fix tab by replacing it with spaces"