@will-moore: any thoughts on @mtbc's comment? Or is it something we'll have to handle across the board?