Fixes #9618 - make identifier uniq per host
(cherry picked from commit f2d5f95539b5070f5c7aba37196c45346140357d)
Fixes #9618 - make identifier uniq per host
(cherry picked from commit f2d5f95539b5070f5c7aba37196c45346140357d)