Card #48 fix to persist a two-way relationship
Merge remote-tracking branch 'origin/develop' into develop