Sprint 7 1093368 merge fixes pd

Merge request reports