commander: brackets added to return switch check
Merge branch 'rc_timeout' into follower