SVY-6864 CTLR drag (partial commit)