Merged r12837 ONLY of p600 into p610

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