Dependent on the merge of #308