Backport from SLHC releases.