25425 Changes to templates (client)
Merge remote-tracking branch 'origin/master'