Comment 20 for bug 1850473

Discussed and reviewed again in Code Review meeting and merged for inclusion in 3.12. This may affect branches that currently have pullrequests that are not yet merged, as well as branches that are still under development. A follow-up message to the Dev list is going out.