Fixes reporting
Merge commit '829a773a6123259c50ad1f17cf18e9258f19062b' into HEAD