Improve reference validation Upstream-commit: dc81c2503163025ec5835cf11c53164a437bad6c Component: engine