Merge branch '2021-09-11-update-docker-container' into next