Merge "Container image arm64 support"