PLFENG-1886: Fix ^M when add new commit
Merge branch 'fix/PLFENG-1886'