Actually, previous commit was for #560, which is now implemented