Merge pull request #9747 from TRox1972/lynda