#583 has been merged, but should wait for #860.