Re #7379 Fix issue with resolution not being calculated
Merge remote-tracking branch 'origin/feature/7379_hfir_resolution'