Merge "Revert "Adding config flag for default behavior on Enabling Mode..."" into main