Merge "Robustly fixed issue where migration from different versions of DB data tables was causing crashes upon grid size switching." into main