Merge pull request #5638 from nabinhait/warehouse_patch_fix

Warehouse patch fix