ID#212: added missing templates.
Merge branch 'release-2.1'