Updates and fixes after CD

Merge request reports

Loading