merge 15695 178735 thanks One more bug for this pile of bugs concerning error checking in unpacking phase. Thanks, Mt.