Merge "Revert "Fix the op mode dependency for the second toggle:"" into main