Merge pull request #5572 from saurabh6790/warehouse_tree_fix

[fix] warehouse tree patch fix