lets talk about the other way to make base images Upstream-commit: 93b98c9fe33a86f7ab8add97a6a6de3769cef65b Component: engine