CON-804 | Changes