Fixes #16577 - enhance unit detection
(cherry picked from commit 0771cec2351c75514abaf1c7040cdd5b74e8ef1d)
Fixes #16577 - enhance unit detection
(cherry picked from commit 0771cec2351c75514abaf1c7040cdd5b74e8ef1d)