Merge branch 'nifty7badges' into 'NIFTy_7'

Fix badges for nifty7

See merge request !514
12 jobs for NIFTy_7 in 11 minutes and 3 seconds (queued for 3 seconds)