This may conflict with #873 . Is this branch rebased on this?