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

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