Fix handling of '__operation__' after commit 1e40c770a6aff7590a5092dd1ff8eb61d4580969
Fix #103 (related commit is 21995020d1cdaa5560ef4a72e3815a4b1d02e67a)
Merge remote branches 'remotes/origin/fix-converting-criteriaobject' and 'remotes/origin/fix-postonlymode-with-related-context' into observable-context