CON-1395 | After CR2