Merge "Disable Sahara by default"