Feature/bug 857107 es compare