Merged r12548-12649 of core/branches/p620 into core/branches/p630

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