NAWQAAN-323

We need to discuss this change with the product owners. I'll detail on JIRA.