Add stack service and fix typos Upstream-commit: 9a6f26ce551dd4b6a76d060675f2ceb97db4680b Component: engine