@Ullimague Creating a separate user story to track this.
This issue has been linked to a new work item: W-8051868
This issue has been linked to a new work item: W-8051867