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