making it possible to add or update entities with a parent
Merge remote-tracking branch 'origin/master'