ok
Merge branch 'hotfix-diagram-inn-stat'
Merge remote-tracking branch 'origin/master'