More changes to Ch-12

Merge request reports

Loading