Updates based on latest version of 13 EAP