Remove RuntimeData from cluster and types Upstream-commit: a40595d498f6e2c58ae539e130d81d00143b0a76 Component: engine