am ca83cd09: Merge "Optimizing: Allow storing value objects in containers."

* commit 'ca83cd09bde09dac73ed66f38dec4bc0bd6afb54':
  Optimizing: Allow storing value objects in containers.