Fixed count to be more generic
Merge branch 'project/6188/helpdeskframework' into project/6188/helpdeskframework-ui