Issue #2399313 by geek-merlin, sylus, rivimey, DamienMcKenna, MustangGB: Relationship silently left out if it has optional required context