included stat_tag when working on the editor CDB-787
Merge remote-tracking branch 'origin/bug/CDB-787' into release/2.6.0