GitLab

* Workarond for memory issue in eager mode.

* Add a TODO

* Fix typo

* Address comments

* remove patch which appear hacky.

* fix typo