Add null check in ID generator
Merge branch 'master' into generic_resources_for_search