Merged revision(s) 12812 from FC/branches/p630:
Fixed bug in combine refactor
........


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