DG-1762 Back to Community triple check