Merge branch '20-prepare-templates-for-integration' into 'master'

Prepare Templates for Integration

See merge request !4
1 job for master in 38 seconds (queued for 1 second)
Status Name Job ID Coverage
  Deploy
passed BranchJobDeploy #414067

00:00:38