Rich collection format.
Merge branch 'master' into staging