Merge branch 'resource-container'