ref #4028 - add another SystemMessageTemplateParameterType
Merge remote-tracking branch 'origin/master'