I've pushed this to master, rel_2_5, and rel_2_4, along with a follow-up patch reflecting the fact that vam.eg_record should be pointing to are, not bre.
I've pushed this to master, rel_2_5, and rel_2_4, along with a follow-up patch reflecting the fact that vam.eg_record should be pointing to are, not bre.