This could be a breaking change to older client code for the same API, so it might need to be opt-in.