Init ID higher up the call stack
Merge pull request #6556 from guardian/id-quick-fix

Init ID higher up the call stack
resolve conflicts