Operator Switch

Operator Switch

Issue #1060