Fixes #16397 - set nested template_combo. objects to optional
(cherry picked from commit d33fe9cd0e07b124e2ab5c87df7f8dfaefd24911)
Fixes #16397 - set nested template_combo. objects to optional
(cherry picked from commit d33fe9cd0e07b124e2ab5c87df7f8dfaefd24911)