Merge "Fix whitespace errors"