Merge branch 'gig-energy' into 'NIFTy_6'

Gig energy

See merge request !411
9 jobs for NIFTy_6 in 15 minutes and 32 seconds (queued for 1 second)