Comment 2 for bug 1871307

I've done a merge request to be reviewed by the server team before uploading the fix.

Thanks for reporting this!