Merge pull request #9466 from TRox1972/patch-1