Merge "Fix incorrect calculation of sizeof package structure"