Merge AHG7 branch with tools control

Merge AHG7 branch with tools control

Merge request reports

Loading