OK. I have no more comments.
Let me know when you are ready and I will merge.