Done: #1175. Please merge that and rebase.