FC-2893 query fix
Merge branch 'p630' of https://github.com/farcrycore/core into p630