Issue #184: Backports for SA-CORE-2012-002.