Code Review for Job #19783

Code Review for Job #19783 - Workitem available at https://www.worklist.net/19783
I'm a little concerned about this change. What sort of testing did you do? Did you verify that all other model editing related behavior worked as before?