[DF-1093], [DF-1094] (save?load components by name, store components in map)

Merged with latest dev version