Add support for advanced ${} uses Upstream-commit: 9707286a5cecde3eee3c83e3c2da65df8e59d04e Component: engine