KCS-3687-Edit