Post by @cmccullough

@crp @cmccullough Yes, I'm merging a branch making it disabled by default but opt-in in the settings. This was already discussed by the team, so we're just merging.