Merge pull request #14262 from francescbassas/patch-16