Fix regression (leaving report looking a tiny bit inconsistent, but running at least)
Merge remote-tracking branch 'origin/dev' into dev