I should be able to accept #707 soon after you applied the latest changes, afterwards you can merge back into this branch.