Closed, preliminary support in [de9f1215]