Subject and object containers can be confused Upstream-commit: cb0f2a2823be749a19780b3b818f22fd61adeacd Component: engine