CON-1028 | Additional changes