Merged revisions 12619-12665 from p630

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