Merge "Change from baseline to docker"