@tobes Agreed. Can we move this to #924