Merged r12849 ONLY of p630 into trunk

git-svn-id: https://farcry.jira.com/svn/FC/trunk@12850 8f7d33b6-1012-0410-9a5a-bb7ecce9c363