Merge fixes: removed patches, removed Warehouse User