DSSSM-589 #time 7m Resolving issues identified within the top-level of collections