Could we put it behind a waffle flag? I suppose this warrants a breaking change (we should notify partners first, of course), but it may be one we want to introduce over a few weeks to give partners + our own apps time to adjust.

That would make this PR much more complex, though :frowning: 

@mattbasta thoughts?