Add change note
Merge branch 'upstream_merges' into make_scaffold