Backport from SLHC releases.
Merge pull request #557 from ktf/backport-slhc-changes

Backport from SLHC releases.