Drop global record tables in upgrade-pre
Extra identifier cleanup
Merge branch 'newdev' of github.com:k-int/KBPlus into newdev