Refactor: remove white space at the end of line
Merge remote-tracking branch 'origin/i0013'