Issue #182: Backport SA-CORE-2012-004.