CON-815 | Implement CR changes