Sync with upstream blueprint