Merge 6.33 for SA-CORE-2014-004