Tweaks/fixes related to custom fields on upgrade

Signed-off-by: Michael Eshom <oldiesmann@oldiesmann.us>
Merge pull request #2035 from Oldiesmann/release-2.1

Tweaks/fixes related to custom fields on upgrade