Another PR is fine for this.