Merge branch 'cherrypick-315-23.02' into 'slurm-23.02'

Cherry-pick !315 into slurm-23.02

See merge request SchedMD/dev/slurm!319