Merge remote-tracking branch 'awasum/docker' into awasum_docker