CON-804 | Chnages after cr