check if BinStore is null (this can happen if a product is corrupt)
Merge remote-tracking branch 'origin/4.10.x' into 4.10.x