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