We are ready to merge the first PR. It is not ideal, since fixing edge cases, listed in my previous post might follow.