Merge branch 'advanced-containers'