Merge "Add support for different container and space calculation logic." into main