SCM-3374-Edit