Fixes #17623 - include model in metadata
(cherry picked from commit f34f70d285d8a7d9a363dd5c7e8f9b9f861ac67f)
Fixes #17623 - include model in metadata
(cherry picked from commit f34f70d285d8a7d9a363dd5c7e8f9b9f861ac67f)