This places the new functionality behind a setting so that we can remain passive until we can change the setting in the next major release. Issue gh-7273