Hand merge of release/update_citations