CMS-1888 Make save Space work