Merged r12392-12453 of core/branches/p600 into core/branches/p610

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