This was resolved now, although I'm not linking to a specific commit as most of the work in 5.8 relates to fixing this.