Fix some model detection instances. Issue #8051
(cherry picked from commit fc89ce5b594f20a3d4819f01500f561893580d41)
Fix some model detection instances. Issue #8051
(cherry picked from commit fc89ce5b594f20a3d4819f01500f561893580d41)