Fix composite mapper bug with block iteration
This change fixes a bug where the composite data mapper was getting a wrong object when trying to access its blocks via their flat-index. The issue was an additional increment when one of the blocks was a nullptr.
Backport: release