Fix debugger display string
Merge remote-tracking branch 'origin/hardcase_work' into DependentProperties