[list] Opensource Merge (r69535)