280 - template 4
188 - tracker 24466
Merge pull request #229 from gsn/master

280 - 188