Cherrypicks from master

Merged Waqar Ahmed requested to merge work/cherrypicks into kf5

Merge request reports