more changes to fix auto eval integration with trash collection. I think things are working correctly now.
Merge branch 'sdev' into develop