Merge pull request #4515 from TDT-AG/pr/20201014-diag-ping6