Card #48 fix for parent child on save
Merge remote-tracking branch 'origin/develop' into develop