#660 added back the setting of calculation value as the value field of the AV DTO
Merge branch 't660' into resolved