DAR-2398 | RR columns fixes after CR