(MODULES-1630) - Expanding source list fix to cover all needed versions