C_raph: DEV-2538
C_raph: PAN-6603