Thanks. Right now, we are in the middle of a development cycle. When we finish this and get the testing done, I will branch and start the upgrade process.
In the mean time, most of the issues during the upgrade were from my module built to extend the DSL. Maybe we can roll some of those features upstream? In case that interests you, I've attached my code.