Merge #1080 esil comparators commit. It requires more discussion