Merge "container-release-4.0.5"