Merge "fixing attribute comparison rule"