Merge branch 'templates' into 'testing'

Templates

See merge request !51
1 job for testing in 1 second (queued for 4 seconds)