Backport of fix #12592 into release/1.1.x#12711

Merged

hc-github-team-nomad-core merged 2 commits intorelease/1.1.xfrom backport/patch-1/ghastly-current-sole

Apr 20, 2022

+4-1

Commits on Apr 17, 2022

backport of commit a099660
chavacava
authored

Commits on Apr 18, 2022

backport of commit 761c6c3
tgross
committed