Patch in #4 is good. I am afraid that MR !7 is targeting the wrong branch.