Merge "Change Values for Opportunistic Entry & Exit Thresholds"