Bugfix in 467a8e9 for fields with prefixes.
More precise bugfix for 467a8e9.
Merge branch 'release/2.4'
Makes RecalculationFieldData public and moves metricField into RecalculationFieldData.