Merge branch 'hotfix/2.1.3.1' into Development
Last debug on template examples.
Merge branch 'release/2.1.4'