Merge pull request #9282 from francescbassas/patch-8