Merge branch 'cherrypick-1310-23.11' into 'slurm-23.11'

Cherry-pick !1310 into slurm-23.11

See merge request SchedMD/dev/slurm!1311