Added support for Generic Resources Upstream-commit: 9319a8a2dd5760b3d0eda359b8c3872f5e37aa87 Component: engine