bugfix in enhanced morton builder
Merge remote branch 'origin/v2.1'