Sync with the source, Luke

Sync with upstream/source