Merge branch 'develop' into 'feature/packaging'

# Conflicts:
#   CMakeLists.txt
4 jobs for feature/packaging in 49 seconds (queued for 3 seconds)