Synched with latest quickstarts/master