from single operator to unary operator
Merge branch 'zisis' into PROD