I pushed this patchset to master.