Merge branch 'devel' into dev_pfeiffer_tpg

3 jobs for dev_pfeiffer_tpg in 2 minutes and 12 seconds (queued for 2 seconds)