Yeah, it's looking quite good indeed. Adapted OGM to most changes, still need to update some more tests to the changed contracts. But I don't expect any more major issues by now.

One thing I noted though was that I lacked a way for passing OGM-specific options set on our custom builder contract to the service interested in that option. I've sent PR #936 for a proposal for this.