The id bug should be fixed now.
Clean up imports.
Merge remote-tracking branch 'origin/dev-BugFix-RequirementIDs' into dev