CON-1076 | First pass