Branch 2.13 was missing commit 867442e9 that later prevented to cherry-pick 0f30a590.
Cherry-pick these two commits to overcome backporting issues with kde abstraction.
kde