PR #1080 will change this, so this one should ideally be merged first.