#1038 - fix template syntax error
merge with master