REL-2127: grim target selection bug fix

PR for merge into develop.