Sync with upstream

Erick Hitter requested to merge update/latest into master

ff26d269

Merge request reports