Merge from vendor branch BZIP: