fixes #11619 - only check template changes when persisted
(cherry picked from commit bf5f18013ad224a93d917d696d94952965a8968d)
fixes #11619 - only check template changes when persisted
(cherry picked from commit bf5f18013ad224a93d917d696d94952965a8968d)