CON-2040 | reformat