Sync with quickstarts