add a plan for dealing with nomenclature diffs
Merge remote-tracking branch 'upstream/develop' into develop