Cherrypick #5260 to release 1.15 branch#5261

friedrichg merged 1 commit intocortexproject:release-1.15cortexproject/cortex:release-1.15from

yeya24:cherry-pick-400-fixyeya24/cortex:cherry-pick-400-fixCopy head branch name to clipboard