Merge pull request #8705 from francescbassas/refs/remotes/origin/patch-3