Applying patch for issue SA-CORE-2014-005