Don't store TargetSite, it's not serializable to text
Merge branch 'develop'