I do not know how to review this changes now. The pull request is closed. And I doubt that I will be able to merge changes back (I do not know how to do it).
I have a change that crosscuts calypso and iceberg.
I will produce a PR and each project should check because else I will get stuck
waiting in an integration deadlock.