Fixes #11035 - template preview feature
(cherry picked from commit de9e7adaa579db01d043d6a04a83c946a3d33850)
Fixes #11035 - template preview feature
(cherry picked from commit de9e7adaa579db01d043d6a04a83c946a3d33850)