ticket 5811 - unit test to confirm already fixed.
Merge branch 'hotfix/trac5811_indirected_optional' into develop