Merge remote-tracking branch 'origin/feature/10095_speed_up_ISIS_LiveListener'
Fix calc resolution bug.

Refs #10097.
Merge branch 'bugfix/10097_calc_resolution_bug' into develop