Merge branch 'spectra_partial_merge' into 'NIFTy_5'

more merges from operator_spectra

See merge request !348
11 jobs for NIFTy_5 in 22 minutes and 56 seconds (queued for 2 seconds)