Merge "Fix issue with upgrading from previous user versions." into main