Start updating fields ready for future remove. Consolidate values so existing instalations do not break. #3488394
Closes #3488394