Thanks for the fast response !
What I might do is just migrate in the latest version version on the Toolkit for the GridManager. I’ve kept my game logic super extracted from toolkit implementation so that I can easily slide in the upcoming cover updates 
Hope the current sale is kind to you!