B-58092 fixed package space for components/datastore