Merge pull request #4950 from peugeot/drtuber