Maybe with a config setting to switch to previous behaviour
Maybe with a config setting to switch to previous behaviour