ContentBundle improvements
Merge branch 'content'