RNGHRT-2437

RNGHRT-2437