Cherry-picked to Plasma/6.1 via !367 (merged).
↧
Cherry-picked to Plasma/6.1 via !367 (merged).