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

Cherry-pick Ticket 17724 into slurm-23.02

See merge request SchedMD/dev/slurm!305