Merge "Merge "Revert "Change Values for Opportunistic Entry & Exit Thresholds"" am: 92e99a6ca9 am: c6c093e778 am: 6c7d65384a"