Merge "Use '#pragma pack(pop)' instead of reset"