Merged r12335-12578 of core/branches/p610 into core/branches/p620

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