v187 22526 Fix dynamically updating comment templates.
(cherry picked from commit 3e1184ae9379b510044c1cbb8debe1638213979c)