fix  OperationLogic_SurroundOperation
fix DiffLogLogic type with polymorphic operations
Merge branch 'master40'