cherry pick trim whitespace