Merge remote branch 'origin/bugfix/7353_vsi_paraproj_issue'
Re #7379 Fix issue with resolution not being calculated
Merge branch 'feature/7379_hfir_resolution' into develop