Issue #2371715 by eshta: Fix goal options to include the current goal when it is limited use.
Merge branch 'Issue-2371715' into develop