Merge "Fix issue with older structure sizes"