Prepare Templates for Integration

Markus Georg Bendelrequested to merge
20-prepare-templates-for-integration into master

"Prepare Templates for Integration" to master branch before the last issue

Merge request reports