Upgrade to E2 spec of 2 May 2019