Remove context from config Upstream-commit: 2fde8dfb832b9041364e3f87b8d145256f3f0891 Component: engine