Fixes DDC-2984. Made DDC-742 more resilient to recurring failures.