I haven't been involved in this branch, but I'm opening the request for
merge issue just to keep track of things.