Stuart created #5184 to add this.