cherry pick SA-CORE-2014-005-D7.patch