MRG: Synchronize with branch develop

2 jobs from 1649-extern-templates-take3 in 31 minutes and 13 seconds (queued for 1 second)
merge request
Status Job ID Name Coverage
  Build
passed #736
native-build

00:28:17

passed #737
shark-build

00:31:12