Updated base image name
Merge branch 'master' into 3.6.2