Merge pull request #1275 from fspindle/fix_various #1396

Job	Run time
build-ubuntu-dep-apt (ubuntu-20.04, /usr/bin/gcc-9, /usr/bin/g++-9, 11)	26m 17s
build-ubuntu-dep-apt (ubuntu-20.04, /usr/bin/gcc-9, /usr/bin/g++-9, 14)	26m 48s
build-ubuntu-dep-apt (ubuntu-20.04, /usr/bin/gcc-9, /usr/bin/g++-9, 17)	28m 33s
build-ubuntu-dep-apt (ubuntu-20.04, /usr/bin/gcc-10, /usr/bin/g++-10, 11)	23m 53s
build-ubuntu-dep-apt (ubuntu-20.04, /usr/bin/gcc-10, /usr/bin/g++-10, 14)	24m 16s
build-ubuntu-dep-apt (ubuntu-20.04, /usr/bin/gcc-10, /usr/bin/g++-10, 17)	25m 24s
build-ubuntu-dep-apt (ubuntu-20.04, /usr/bin/clang, /usr/bin/clang++, 11)	30m 31s
build-ubuntu-dep-apt (ubuntu-20.04, /usr/bin/clang, /usr/bin/clang++, 14)	31m 8s
build-ubuntu-dep-apt (ubuntu-20.04, /usr/bin/clang, /usr/bin/clang++, 17)	33m 16s
build-ubuntu-dep-apt (ubuntu-22.04, /usr/bin/gcc-9, /usr/bin/g++-9, 11)	21m 47s
build-ubuntu-dep-apt (ubuntu-22.04, /usr/bin/gcc-9, /usr/bin/g++-9, 14)	23m 11s
build-ubuntu-dep-apt (ubuntu-22.04, /usr/bin/gcc-9, /usr/bin/g++-9, 17)	24m 23s
build-ubuntu-dep-apt (ubuntu-22.04, /usr/bin/gcc-10, /usr/bin/g++-10, 11)	23m 49s
build-ubuntu-dep-apt (ubuntu-22.04, /usr/bin/gcc-10, /usr/bin/g++-10, 14)	23m 50s
build-ubuntu-dep-apt (ubuntu-22.04, /usr/bin/gcc-10, /usr/bin/g++-10, 17)	24m 52s
build-ubuntu-dep-apt (ubuntu-22.04, /usr/bin/clang, /usr/bin/clang++, 11)	32m 29s
build-ubuntu-dep-apt (ubuntu-22.04, /usr/bin/clang, /usr/bin/clang++, 14)	33m 11s
build-ubuntu-dep-apt (ubuntu-22.04, /usr/bin/clang, /usr/bin/clang++, 17)	35m 57s
	8h 13m 35s

Provide feedback