Merge "ART: Add entries_ lock for race condition"