Revisions on relations are not loaded correctly resulting in wrong data in includes

Problem/Motivation

Same problem than here: Revisions on relations are not loaded correctly resulting in wrong data in includes

Steps to reproduce

Same than parent issue.

Proposed resolution

For now, I just ported the patch proposed in the parent issue. We should follow the parent issue and fix the IncludeResolver class of this module once the parent has been fixed officially.

Remaining tasks

1. Wait on parent issue to be fixed.
2. Port the final fix to this module.