Merge branch 'various_pa' into 'NIFTy_6'

Various pa

See merge request !487
11 jobs for NIFTy_6 in 8 minutes and 48 seconds (queued for 1 second)