Fix equality check
Merge branch 'master' into ARC