Merge pull request #10854 from agileware/patch-2