Merge "Merge "Revert "Change Values for Opportunistic Entry & Exit Thresholds"" am: 92e99a6c am: c6c093e7 am: 6c7d6538"