Merge pull request #10276 from javiereguiluz/patch-3