DIAMOND-7337-2