Merge of branch passerelle_dawn_v3 (passerelle@google)