Added configuration setting to enable feature