Resync of subsidence_demo branch with Docker files