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