7.0 stage last draf

Merge request reports