cherry picked: 104a21d465e7190529047c2e3b5e784efc1a69b2 Differential Revision: https://phabricator.kde.org/D596