Merge branch 'docker' into dt-test