Sync with upsream master and create extension folder.