Stable with capped collection
Merge branch 'develop'