[[ Bug 11928 ]] Another tweak to index calculations.
Merge branch 'bugfix-11928' into release-6.6.3
Merge branch 'release-6.6.3' into develop