Merge branch 'its7080' into 'master'

ITS#7080 And modrdns

See merge request !475
3 jobs for !475 with its7080 into master in 55 minutes and 58 seconds (queued for 5 seconds)