Merge branch 'Plasma/5.18'

Authored by crossi on Apr 30 2020, 7:57 AM.