fix bug & shine report
Merge branch 'master' into addon