Used similarity operator instead of equality one
Consistency fixes
Merge branch 'oro/grid' into PIM-1845