Fix Docker build
Merge branch 'refine_dockerbuild'