Merge branch 'release/0.21'
Merge tag '0.21' into develop

Bug fix release

field index calculation for multi-fields