Merge remote-tracking branch 'remotes/smcv/ready/template-syntax-test'