Case 3115 - Fixed counters.
Merge branch 'case-3115-fixes' into develop

* case-3115-fixes:
  Case 3115 - Fixed counters.