See comments on #2713 about #2704

The change is good but breaks some test suites of users.
We need a way to keep the previous behavior and help users to migrate to the new behavior.
A warning message could be added when the previous behavior is enabled.