Merge branch 'issue/restructure_structure_functions' into develop

4 jobs for develop in 20 minutes and 25 seconds (queued for 13 seconds)
Status Job ID Name Coverage
  Test
passed #7916
debian:10 clang-6-libcpp-17

00:20:25

passed #7915
debian:10 gcc-8-17

00:15:16

passed #7917
debian:9 gcc-6-14

00:13:43

passed #7918
ubuntu:18.04 clang-6-17

00:18:58