Remove 'special' container
Restore updateListWrite
Merge branch 'master' into remove-special-containers
Merge pull request #5789 from guardian/remove-special-containers

Remove special containers