DSSSM-717 #time 2m Resolving an issue related to indexes passed to empty arrays