More on logic.
Merge remote-tracking branch 'origin/leader_logic'