Sync with upstream

Erick Hitter requested to merge update/0.92.2 into master

96a334d

Merge request reports