Merged revision(s) 12726-12752 from FC/branches/p630

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