Support direct container specs.
Merge branch 'master' into api-v2