Issue #4806: Merge * unpacking fix from 3.5