merge from boxes_resource_refactor missing commit message: "refactored box resources for better GC and consistency over network save/load"