update branch with master

Nico Vermaasrequested to merge
master into SDC-938-cleanup-service

get all the updates in master into this branch for seamless merging later

Merge request reports