Merge "fix BufferItem flatten/unflatten alignment" into mnc-dev