IST-107, fixed report
Merge branch 'master' into beta