Merge "Fix transitive equality error in set." into lmp-mr1-dev