backport from 3/master to fix svc_cable editing, RT#22009