Merge "[TASK] Remove trailing whitespace"