Merge branch 'master' into 'compile_speedup'

# Conflicts:
#   code/src/toolboxes/reconstructor.cpp
1 job for !33 with compile_speedup in 17 minutes and 21 seconds (queued for 1 second)
merge request