Sync code changes with master
Trim trailing space