Synched with latest EAP Quickstarts