Makes sense. Shall we add it here, or modify #715 and merge that?