Fix for `instance_ids` helper when list is undefined
Merge pull request #1041 from reciprocity/feature/fix-instance-ids

Fix for `instance_ids` helper when list is undefined
Merge remote-tracking branch 'origin/release/0.9a22' into develop