Merge branch 'contrib-docker-cleanup'