Update macro adding several improvements

Merge request reports

Loading