[B#1004] bringing over code from 978 for target edit