Re #10559. Fixing usage tests.
Merge branch 'feature/10559_stat_service' into develop