Pull esi-support into release branch