reports improved
conflict solved
Merge branch 'wild-stas-master-fix'