DG-1762 Back to Community fix