DSSSM-161 #time 2h 1m Resolving issues for testing