Melanie/Ajay | #3933 | Calculate with NaN value fixed for repeat and group questions