[gin] Enable ES6 and re-apply gin changes for evita.