SDC-470: Fixes after local testing

Merge request reports

Loading