Please forget this comment for the time being.
We will come back to it if needed later on.

I found some other issues.
Let's discuss them in the corresponding JIRA as JIRA is easier in term of content edition.