1) Fix indent inconsistent problem.
Merge remote-tracking branch 'origin/develop' into develop