Cherrypicks from master

Waqar Ahmed requested to merge work/cherrypicks into kf5

Merge request reports