more work on the operator callback
Merge remote-tracking branch 'origin/master'