Would be good to have it opt-in, without any sort of inpact, for users, who aren't using it.