Merge "ART: Revisit users in phi elimination"