Merge pull request #15834 from francescbassas/patch-16