Merge "add is_opportunistic into related atoms" into main