Synced with upstream (whitespace)