[V3] remove tailing white-spaces

rebased #280.