* FIX: Optional parents vs change notifier
Merge branch 'master' into debug