Merge branch 'docker_containers' into dev