Merge "Define entry and exit threshold for opportunistic"