update master with new additions

Merge request reports

Loading