fix Operator use
Merge branch 'feature-fix' into develop